Fix: Convert branch names to valid Composer dev-branch format #218
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When building nightly packages, branch names like "develop" or "master" were being used directly as version strings, causing Satis to fail with "Invalid version string" errors. This fix ensures all branch names are converted to Composer's dev-branch format (e.g., "develop" → "dev-develop"). Changes: - package-modules.js: Update chooseNameAndVersion() to convert branch names from composer.json files or git refs to dev-branch format - package-modules.js: Update createComposerJsonOnlyPackage() to convert branch refs to dev-branch format for package filenames - release-branch-build-tools.js: Remove early conversion of branch refs that was causing issues with version determination The fix handles multiple scenarios: 1. When version comes from composer.json containing a branch name 2. When no version exists and git ref is a branch 3. When creating package filenames from branch refs This ensures compatibility with Composer's version constraints and allows Satis to properly process packages from development branches.
|
Code looks good to me in theory. I need to test the various build types with it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When building nightly packages, branch names like "develop" or "master" were being used directly as version strings, causing Satis to fail with "Invalid version string" errors. This fix ensures all branch names are converted to Composer's dev-branch format (e.g., "develop" → "dev-develop").
Changes:
It's hard to test this fix, but I've been able to run
act schedule --container-architecture linux/amd64 -W .github/workflows/build-mageos-nightly.ymland make it finish with no problem (except not being able to push the mirror because of missing secrets on my local build).This is very delicate cause it could impact the normal mirror/release building processes.
Fixes #171